From: Dan Winship <danw@gnome.org>
Date: Mon, 4 Apr 2011 17:52:25 +0000 (-0400)
Subject: src/Makefile.am: two fixes to the gnome-shell wrapper handling
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8348
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6abb86dff625da595d860be999b1e8b774d29b3b;p=gnome-shell.git

src/Makefile.am: two fixes to the gnome-shell wrapper handling

Add an uninstall-hook to undo the effect of install-exec-hook, and add
an $(AM_V_GEN) to the rule that copies either gnome-shell-real or
gnome-shell-jhbuild to gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=646730
---

diff --git a/src/Makefile.am b/src/Makefile.am
index eb211206c..31ff58b8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,9 +29,11 @@ endif
 
 noinst_DATA = gnome-shell
 gnome-shell: $(gnome_shell) Makefile
-	cp $< $@.tmp && mv $@.tmp $@
+	$(AM_V_GEN) cp $< $@.tmp && mv $@.tmp $@
 install-exec-hook:
 	mv $(DESTDIR)$(bindir)/$(gnome_shell) $(DESTDIR)$(bindir)/gnome-shell
+uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/gnome-shell
 
 generated_script_substitutions = \
 	    -e "s|@bindir[@]|$(bindir)|" \